Remove unessesary files and fix migration