Removed old, useless and obsolete stuff.