Remove duplicate code / unbreak the build