Removed Commented Code from Boyang

I also checked to make sure our stuff worked right and corrected some
stuff that got loss in the commits that happened last night