I believe there are a number of locators still in this file that can be removed due to being moved into the app object(s).