cleanups, can actually run on devel laptop now