removed special-case solved by simplifier in output and simplified global structure further