some renames
unused code removed