finish cleaning up debugging/testing stuff