Clean up

remove unused code