Hook consistency and clean up.