*8451* remove unecessary code, add JS handler, application static method