#50 Removed dead code.