Replace the parameter EntityQuery with EntityTypeQuery for the removeEntityType or create an overloaded method for removeEntities with the following signature:
Boolean removeEntities(@NotNull EntityTypeQuery query) throws DataFactoryException;
This will make the method less ambiguous.