deleting unused code, renames, small tweaks