Commented out some troubles code