Removed obsolete changes