LPS-46232 Remove the state added by the XML elements
LPS-46232 SF
LPS-46232 Fix compile errors
LPS-46232 Remove unused variables that made it stateful
LPS-46232 Remove unused methods
LPS-46232 Let's use this pattern instead, in case we decide to Spring it or Factory it in the future.