Code cleanup, remove load distribution