code cleanup
build rc-4