Cleared unnecessary code