remove dead code
remove dead code
fix indentation