Remove glob references and other deprecated syntax