Got rid off some old code... 'old'