Add cleanup and fix deps