cleanup
dont use deprecated symbols