Removed barn's old code for our spanky new one