Removed some useless stuff
Ready to build!

Change-Id: I4a08690eb923bbc551c78864cfe1f45e3a0ae482