Clean left overs

Removed items deprecated, not used anywhere anymore

Change-Id: I028270aadbd356769e23013a8e3ca5e026f8054d
Reviewed-by: Matti Paaso <matti.paaso@digia.com>