Generalised select render and removed dead code