Clean up Selector and cell code