Remove commented legacy