Simon: Cleaned up package installation