Remove non-idiomatic assignments