removed unneeded garbage and closes #7