Remove single-use, oneliner methods