cleanup

start of cleanup of beta