Cleanup; minimum of TODOS/Ideas.