Removed some old code that is not used anymore.