removed redundant and commented out code