Remove 'select' statements until ready