Remove buggy landscaping mode, refactor