Bug fixes

remove this