Modify remove subject button and remove unused