Removed hard coded and NO VERSION denpencies T3-1195