Cleaning up after better modularization.