Clean up some todo's