Removed some old methods