removing unnecessary code, closes #27