Update: comment some undefines