Removed extra printouts and tidied generated source files