upgrade deps. and cleanup