This method is not required anymore (we should also remove it from config)