Commented out two things