Simplification
Removes unnecessary helper methods and unused lines of code.