Removed

Closes #20 and closes #21.