Clean out unused, commented code