Misc fixes

remove