First pass for cleanup