Cleanup more --- NO WARNINGS!!!