Remove commented out bits