More pruning and cleanups