Cleanup selector organization