Clean out unnecessary helper methods