Cleaned up some relics from before