refactored maven group
removed old code