Fixed close and remove actions