Implemented the do_remove_entry function to the updated definitions and remove function