Initial cleanup of dependecies: common