Remove commented declares