Stripping out unnecessary code for refactoring (Pt1)