removed 'old' code