Can we remove this from here and move the logic to the build() method? This way we can avoid removing the entries later if user specifies them.