Comment unused feature and refactor models