Remove commented out code, make "name" required