- New Command Code Cleanup