Removed unutilised code