remove useless models and fix HABTM issue