#281 Remove commented code