Removed commented out stuff.