Removed duplicates from Mathias' last commit