cleanup some unused or unnecessary code
translate: fix indentation