Update javadocs, remove unnecessary code, use InjectionPointIndicator
feature and some code cleanup.  Next up is test and implementation
for dynamic changes