Remove unnecessary code

The removed codes have been unnecessary since commit b7cefd0c