Remove beta message, misc. cleanup