code and dependency cleaning