Build made a bit simpler. Removed stuff which we do not use