Cleanup of TODO