Fix orientations of constant objects
cleanup