Clearing up mess for docs build to pass