Removed 10.4 code