Cleaned up some more old code