Removed old code tu support migration from 1.4 to 1.5