removed redundant testing code