Finished cleanup (closes #74)