cleaning up orientation management