removed more expressions