more changes related to @bb43784 ' Removing use of subclassed applicati...

...on constant and instead using the'