Remove commented (unused) code