Remove workaround code and remove unnecessary method.