further clean - up