[#5] Cleanup