Unnecesary code removed