- fixed issue BE-396 (resolve issue: resolution=RESOLVED status=Fixed)

- some cleanup