v 2.0 initial cleanup