cleanup
Added Rotation and Orientation scaffolds