* Removed some old code