static/inline cleanup