Removed some old functionality