Used class constants instead of  global constants
Removed debug code
Removed debug statements
Updated janus to fix lib icu issue