adjustments; removes unused code