MAN update & cleanup