Removed unneccessary package configuration; moved to common