Removed some commented out code and some requirements that were not being used.