Yosemite changes and general cleanup