remove moved methods
syntax improvement
syntax improvement