More simplification stuff
dooooone.