Removed old files and updated Model Manager and api lib