removed merge leftovers

left is the code from HEAD, reading 'AmonOne' instead of "AmonLight"