Removed commented out parts of functions since they aren't being used.