Clean up and changed base use file.