Fixed problem with delete; renamed delete --> remove