More expressions
Deleted a bunch of unneeded modules.
8# Please enter a commit message to explain why this merge is necessary,