Messed up images controller
Removed mis-generated image controller and various other un-needed test units.