Remove commented out code, fix typo