Remove old experimental code