[#6] Cleanup