[#9] Cleanup