Minimal code cleanup