Add public markings
Simpler footprint. Remove async and non-critical functions