Temporary patch, remove persistence module