right lets get this fucking crap sorted, stuff not needed is going bye bye

Change-Id: Iaff404888f06699e7d729c29c1e5a465c40e4385