further clean-up
still not functional again