Weird Sync Cleanup

There were some conflicts in my last sync, so just clearing away some
weird stuff that was added in.