It is time to clean up the API and we have two concepts
that do the same. So we should remove one of them.

Change-Id: I9dbc4903272e4eda5b173045fb49bfeb99029561
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>