Final cleanup, pull out selectors