Cleared more unnecessary code