arbitrary remove
clean up code