fix dependencies
full cleanup