Code Cleaning - Dead Code and Commented code