renamed some classes method name "delete" -> "remove~"