Cleanup main and utility classes