Kayvan/remove entries