final fixes to remove unfinished work