further clean-ups