some cleanup on TODOs