remove package logic from main