Removing old test code from stage1