Removed unneccesary libraries and helpers