Deleted some commented out sections