NOJIRA Removed extraneous code; fixed public access