Ampsim Clean up