Removed obsolete code from last commit