Remove unused code
Inlined combo resource classes in order to reduce external dependencies