[#5] cleanup