removed some bloat