Remove dependancy on v4 support library