Cleanup dependencies, remove suit