Remove extraneous helper method
Mock deeper to allow for better tests