Resolve Xcode 6.1 update warnings
Remove now-unused leg target