removed beta-stuff