Removed all commented out sections