Removing explicit JVSTM dependency