Removal of as many assumptions as possible