cleanup and omnicomplete menu changes