removed more non-essential code
removed more unnecessary code