Prevent floating when moving up
Refactor shared remove behavior