Removed old selector code