Yanked out comments, cleaning up corebaby