eliminate sloppy code that assume things