Pom cleanup. Additional changes to support UI authentication.