cleanup
purged
fixed tests