Removed old code marked with ObsoleteAttribute