INTERNAL: get rid of comet dependency.
INTERNAL: not used classes removed.