Fixed deletion functions to delete from States