Fix object removal + add demo.