#7 remove some page object chaining
#7 remove the rest of the page object chaining