Cleanups concerning weights