Andy : removed redundant variables