Remove static definitions