Remove unoptimized code