Removed obsolete parts of the code