misc fixes and removals