Removed unnecesary things