Remove unnecessary directory expansion
Update packages