Bug fixes

remove this line