Removed extra unnecesary code