Removing GenericHelper.java