Killed some code bloat.