some todo cleanup