Commercial: removing commented out code