No longer need removeCurrent()