Refactoring: maven warnings removed