remove unused code
usability fixes