Cleaned up some stuff that shouldn't be in the master yet.