Removing obsolete sub interface of BuildContext
Cleanup and javadocs
Fixing typo