cleanup global namespace, make strict conform.