clean up code, remove unused dependencies