Getting rid of old commented code