[#72] Clean up