Removed some old piece of code