cleanup and changes due to Yosemite update