Remove even more code.