Added optional flag to drop package statements