further clean-up