Removed some bloat