Core util clean up

Removes unused classes.
Address few Javadoc issues in code.