NOREF: Removing a lot of fluff from my base module