If we're not using these anymore, let's get rid of the commented out stuff. If we ever need to bring them back up we can just reference our old commits.