Some obsolete parts of code removed.