More pruning. Added some TODOs.