Cleanup; now is just a TODO app