Not so final cleanup