killed redundant code