Cleanup. Remove some unused and broken code.

Change-Id: I6b1c9b4cd406da91c6642a9cad0e225d8473df20
Reviewed-by: Niels Weber <niels.weber@digia.com>