Remove more unnecessary code