removed/commented out some unused stuff