refs #1 - removed dead/useless code