cleanup
rationalize static usages