Refactors Greeting class and removes use of ID tokens

Corrected pom merges