Eliminated one WITH clause and comments