Cleanup putting in api modules.