remove premature caching optim, clean some Todos