maintain(*): replaced unsafe methods with safe methods