Code cleanup
RC1