Eliminated some leftover testing hacks