Base code cleanup and image baselines