Removing some bloat