neatened, remove in class for now
neatened, removed defunct tests