Code and dependency cleaning