Removed dead code after code review