S60563: Remove non-4514 versions of code and tests