#213 Removed dead code