Cleanup and fixed dependencies