Remote unnecessary code