removed commented out stuff