Not only does thius simplify the code, it also filters out duplicate entries that occur in dev setups