Commented out bad code but there are still conflicts.