removing some test modes