Cleaneup for beta 2