First draft of remove function