Cleanup comments / removed Model from classmap (already covered)