"TODO" cleanup