You could get a D/A polisher and use a swirl remover to get it out then use regular wax like meguiars....