Removed 1.0 code