remove code moved in previous commit