Removed duplicated code, probably the result of a careless manual git merge