+1 for the cleanup.