Removed unneccesary headers in classes.