Remove unused definitions
Added voided