cleaned up models, added updated roygen files