Better development ppment practices, remove unnecessary code