remove commented out code
Update default package handling