finish code for removing