Simplify, remove assumptions