cleanup, move some methods to ursecmon