more fixes to clean