General: Unused View controller clean up