Removing some debug info, comments