removed dead code; changed terminals