Continue removing unnecessary code