Cleanup of todo's