Changed names to remove redundancy
Removed logger
Merge branch 'cg_cleanup' into cg_guicy_resteasy