Cleanup. Closes #278