~ further clean-up