fixed #496 (dganitd) - merge FB
refs #501 - delete unused property