Removed dead code (again)