Clean-up #2 ...