Remove unneeded stuff

Change-Id: I2771765bd331e81e09141a2f3088fb364d4bf90d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>