removed redundant setup routine