Deleted some commented out code