updated code
removed outdated code