removed unused code from previous merges