Unecessary stuff removed