Removed some old code (oops)