Remove unused code that can now be implemented better

Change-Id: Ib318509052bbaa5d9db3a5878fad4696dee90d10