Cleaning code, removing un-needed consoles and other chunks