Code cleanup, edited tests, and updated benchmarks

remove until we cut a new release