cleanup
do not make proxy classes