Fancy remove (try it out!) and other tweaks