Removed duplicated code from Package project