[#205] Clean up