removed not used varaiables