Remove direct calls to logic variables
Initial support for MRML