cleanup for adjustment code, added extra TODO