[#652] Clean up