Clean more unnecessary code