Pruning and fixing issues.