more changes related to @bb43784 ' Removing use of subclassed application constant and instead using the'