Remove all references to the old v4 code

The old v4 files have already been removed, so cleanup
all the #ifdef'ed code that still references them.

Change-Id: Ifc5c59add5af36a61586a43b13291d7836cccd78
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>