Removed some old code not used anymore