Cleanup with implementation file.