Merge commit '3a478ff' into eg-fixes
removing old code