Cleanup headers and finish functions for L6470