shorten some of our excessivelyLongFunctionNames
Dead code removal