removed unneeded left behind code