Removed unnecesary stuff