Updating
Removing legacy code