Commented out code is now removed