Breakpoint - after adding packlist py and cleanup