updated datamodel and removed garbage scripts