Remove fancy optimization