New cleanup for a new installation