Let's start clearing out the old experimental code.