common: some changes, clean-up