use new shrink function
remove unused headers