get rid of rhino explicit dependency
minor code cleanup