Cleared up some more bloater code.