closes #7 and closes #8. Removes useless code