Deleted not relevant code in OrientationListener and a useless class refs #2572