Clean up
Performance bug removed.