Fix removing and protection