cleanup unused code in v1 which has been put into the v2 branch