Refactor out mover; use new remove syntax; ignore collision specs