some cleanup on delete badge functionality