Removed: obsolete code
Touchups: to testing
Touchups: to testing