Removed non used state variables