Revert "bug fix, classpath fix for R22, and minor formatting"

This reverts commit a2e8c3b0c47f74cc9b01c18dce10aa927ec5c049.