Removed some old functions