Cleaned out commented-out and deprecated code
Closes #25