Remove warnings + groundwork for final validation.