Removed commented out code. Still messy