#234 - Code cleanup - removed unused code