Removed commented out unused stuff