update common
cleanup