removed deactivated code