Adding multiple removal support. closes #2