Removed moar comment related stuff