clean up

remove unused parts