1c cleanup