Removed some bloat.