TST: some cleaning up