RC1 ... still

code cleanup