update softRemovable behaviour to run after remove hooks. Also updat reference to collection-hooks