Removing custom-sourceset and custom-convention