Pruning code and improving name spaces.