remove workaround codes