Removed useless lines as per code review from dave (via email)