Removing assumptions