Remove last global vars, hide utility functions