Updated all the things, removed unused files