Removed unneccesary stuffs