removed some bloat code and fixed a test