Final cleanup and fixing no orientation provided issue