Removed some old code we probably won't need