Remove unneeded commented out code blocks