indent
remove unneeded functions