Further cleanup of menu..