Removing uneeded static definitions