Remove unused stuff.
OPApp should use the new singleton macros.