clean up

tests cleaned up, unused code removed