dependency fixes and cleanup again