Removed untested code; moved to beta branch