Remove unused definitions