removed unnecesary commented out stuff