Removed unnecesary stuf