Removed test code following remerge of test branch