Commented out some unused stuff