Fixed some bugs in OoC and added a remove option