Fix /remove syntax

This makes /remove work with the correct syntax while also allowing it to work with the previous syntax too. This fixes #860 

This compiles but it's untested, so it should be tested before a merge.