Removed code obsoleted from prev commit.