removed unused modules, added models