Removed commented out stuff