Update removeClause to correctly handle multiple calls. Fixes issue #38.