clean up

remove unused variables, extra components, etc