further clean-up - now testing and functional review