sec: Proper prefixes and unused function removal