Remove unnecessary GameObject tests
Remove unnecessary Landscape test
Cleanup a little bit